If the window is destroyed, we still need to deliver the destroy event.

2005-09-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c (gtk_get_event_widget): If the window is destroyed,
	we still need to deliver the destroy event.  (#314980, Chris Lahey)

diff --git a/ChangeLog b/ChangeLog
index 5109339d9f3a1c3449fe185ba0c15307dce5b80f..f4e19fa615a7efbe33b004aa5630285380006670 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmain.c (gtk_get_event_widget): If the window is destroyed,
+       we still need to deliver the destroy event.  (#314980, Chris Lahey)
+
        * gtk/gtktextview.c (gtk_text_view_key_press_event): Reset 
        im context before committing \n or \t.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5109339d9f3a1c3449fe185ba0c15307dce5b80f..f4e19fa615a7efbe33b004aa5630285380006670 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-09-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmain.c (gtk_get_event_widget): If the window is destroyed,
+       we still need to deliver the destroy event.  (#314980, Chris Lahey)
+
        * gtk/gtktextview.c (gtk_text_view_key_press_event): Reset 
        im context before committing \n or \t.
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index bb0eecaaebac3092fe65747080050382e0c47396..56f3c986f869e26dbbb7fdbc37546d5649344891 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -2044,7 +2044,7 @@ gtk_get_event_widget (GdkEvent *event)
 
   widget = NULL;
   if (event && event->any.window && 
-      !GDK_WINDOW_DESTROYED (event->any.window))
+      (event->type == GDK_DESTROY || !GDK_WINDOW_DESTROYED (event->any.window)))
     gdk_window_get_user_data (event->any.window, (void**) &widget);
   
   return widget;